Update the gitigonore file, add media/ var/ folder to the git
Solve the conflict