Checking in merged changes from previous commit