Commit after Merge conflict +Style update