Reverted to older revision due to catastrophic merge conflict