Merge and resolve conflicts of SimBen