Forcing conflicts
Merge branch 'master' of github.com:vanblaze/honeypot
Force conflicts
Merge branch 'master' of github.com:vanblaze/honeypot
lalala
Merge branch 'master' of github.com:vanblaze/honeypot