first commit
merged - fix conflicts