no idea what i'm committing
fixing conflicts