added myself as contributor
Resolved conflict