Fixed all merge conflicts