commiting changes
merge conflicts
merge conflicts
fixed merge mistakes