Try this one tip to not just AVOID conflict, but RESOLVE it!