fixed conflict and messed up shit