resolving merge conflicts 2nd time. Will delete project_model branch