removed conflicted snippet
merging with origin