Need to commit before merge for some reason