Reverting still

not sure how to resolve conflicts yet