Removing conflict leftover