Resolving conflicts with divya and rathins code with master