Added web api commands to merge a feature and resolve a conflict using a specific feature.