Resolved conflicts and added ang_chinmichael