Committing file which may create a merge issue in the future.