Adamdev

fixing merge conflicts