Changes by Akshar
conflict resolution