quick refactgit
quick commit
commits before merge
merge fixes