removed merge conflict stuff