Removed conflict remainigs