merge conflict now resolved

Change-Id: Ic9387736d8591ebabf9c08191a1ddd587a9aa355