Resolving conflicts

Change-Id: Idc42d06ae9ac1a27760439a24dabd2c7ff2e513f