sorry im git impaired
fixing merge conflicts