Bug fixing
changes on master
manually resolve the conflicts