I'm concerned about merge to master. Does it merges without conflicts?