This is always going to be conflicts. Simply learn how to properly handle them.