committing before merging to master