Commit all + Merge