merge working when there are no conflicts