Removed small changes to fix conflict