init
conflicts fixed