Merge latest form gene. Resolve conflicts