changed files
resolved conflict
Added types implementation in Agda