Showing a merge conflict. And some work on communication