File created locally
Local file changed
More changes to local created file
File created remotely
Updated remotely created file
Merge branch 'remote_created_branch'