merge and added edit actitivy