Git Merge Assignment