Fixed replaces / conflicts