nasty merge error

Change-Id: I5afaf03c5aee417ea40cea65b2ac51dde7c35918