Adding IDE workspace.xml
Fixed merge.