Added capture
Merged conflicts
Merged conflicts again