first step
merge conflicts fix