removed unused capabilities
fixed merge
re-fixed manifest