backmerging development to resolve conflicts