Added oan gesture and fixed merge in coreData