OrientationHandlerevent added
Conflict resolve