Removed merge conflict left overs