Commit before merging
Update after merging