adding change to show merge conflict
fixing merge conflict
adding all the less files for each prject member