Removing conflict statements