saving merged changes
Updated git info for work