Fix possible conflicts

Change-Id: I9c6fb4fd2d5175cd5412eaffb5712205bdde30de