Remove merge left overs