adding xml implementation for saving a project file
resolving conflicts