all conflicts fixed hurray