Cleaned up conflicts as Im not sure how to properly do that