e: a add
conflicts fixed