conflicts fixed(hopefully)