added winphone for merges folder