fixixing merge conflicts