Added trampoline
Fixed conflicts.