prepare to pull
fixed merged conflicts after pull
posting working to server
writing existing items