resolve conflicts between branch/master