[MERGE] resolve conflicts