added username
drew a picture
removed file
drew a picture
resolving conflict