Resolved conflict

Resolved conflict from editing aTextFile.txt locally and from tje browser before committing/syncing.