deleted some weird merge conflict stuff