Fix merge problems

manual correction of merge problems

Change-Id: Id68e70a17159fbf3336c985860d6b080bb22e982