add ayesha
fix conflicts