Merge lagann into flitter