Added web api commands to merge a feature and resolve a conflict using a specific feature.
Attributes no longer look for hard coded values during merge feature.
Merge remote-tracking branch 'origin/pr/545'