e: dev
conflicts fixed