fixing the things
merging in conflicting pages