Commit before merging
Second commit before merging
Final update after merging