Reverted all changes made after merging