Find neighbours maybe ok
Remove merge conflicts