I have played around with branching and merging last night, and it seems hard to merge changes back into the production version of code. Have you found that to be the case, or is it just because of inexperience?