commiting production version with production stuff
first merge conflict resolution