DEL line 5b & 5c
ADD Line 4
Merge branch 'feature/7'