Commit before merging for Nic