Removed merge conflict leftover