Fix merge problem with categories

Change-Id: I628bffeb4cac16cf50def6d5562fb9e2b9fa8933