removed merge relicts