Git Add Commit Push Merge