committing to merged master1