trying to commit and merge again