core: Remove merge conflicts

Remove conflicts introduced by 849bc154945f0f2ee8bb6b62f5b9de6fef02436d

Change-Id: Id84b1f2efefe6d02bd849a6365e66b511d387f19
Signed-off-by: Allon Mureinik <amureini@redhat.com>