preparing for merge
merge conflicts solved