commit changes before merge
merge conflicts further resolved
removed unwanted files