remove constants re-added on merge