removed merge conflict things