Fixed Conflicts

Change-Id: I7b655bfb2fcabaabb406aa35aeab9983fd569ea5