resolve conflicts between assignments and master