Removed remains of conflict