Resolved conflict

Commented out the original master parts