Rebuilding Forked projects....
~/Desktop/everest-2/Waterfall ~/Desktop/everest-2
Resetting Waterfall-Proxy to BungeeCord...
Your branch and 'origin/master' have diverged,
and have 42 and 31 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
HEAD is now at cccbb3c8 Netty 4.1.17.Final
  Applying patches to Waterfall-Proxy...
Applying: POM Changes
Applying: Rename references from BungeeCord to Waterfall
Applying: Add Waterfall configuration files
Applying: Configurable Waterfall Metrics
Applying: Fetch modules from the Waterfall CI
Applying: Get rid of the security manager.
Applying: Presize the HTTP response buffer
Applying: Don't access a ByteBuf's underlying array
Applying: Fix unicode characters in configuration files
Applying: Optimize uuid conversions
Applying: Add support for FML with IP Forwarding enabled
Applying: Better unit tests for Chat API
Applying: Don't allow channel buffers to grow beyond a reasonable limit
Applying: Allow removing servers or changing addresses on reload
Applying: Enable TCP_NODELAY.
Applying: Micro-optimizations
Applying: Allow invalid packet ids for forge servers
Applying: Resolve sendData() deadlocks
Applying: Add basic support for configurable tab-complete throttling
Applying: Don't create a new KickStringWriter for each new connection.
Applying: Optional server list ping logging.
Applying: Add a property to accept invalid ping packets
Applying: Use a worker and a boss event loop group.
Applying: Better Decompression Sanity
Applying: Validate that chat messages are non-blank
Applying: Reduce the overhead of lots and lots of teams with the same names
Applying: Better debug checks
Applying: Add dynamic server addition/removal api.
Applying: Don't send KICK packets while in HANDSHAKE state
Applying: Improve ServerKickEvent
Applying: Configurable server version in ping response
Applying: Add timeout variant to connect methods
Applying: Proxy query event
Applying: Dump the raw hex of a packet on a decoding error
Applying: Fix potion race condition on Forge 1.8.9
Applying: Optionally use async Netty DNS resolver
Applying: Security enhancements for EncryptionUtil
Applying: Improve outdated build message
Applying: Fix some forge plugin message packets not being forwarded correctly
Applying: Use Log4j2 for logging and TerminalConsoleAppender for console
Applying: Handle plugin prefixes using Log4J
Applying: Allow plugins to use SLF4J for logging
Applying: Add Log4j configuration that replicates the old BungeeCord setup
Applying: Add console command completion
  Patches applied cleanly to Waterfall-Proxy
~/Desktop/everest-2
From C:/Users/natha/Desktop/everest-2/Waterfall/BungeeCord
   eab710b0..cccbb3c8  upstream   -> origin/upstream
Resetting Everest-Proxy to Waterfall-Proxy...
Your branch is ahead of 'origin/master' by 8 commits.
  (use "git push" to publish your local commits)
HEAD is now at 71967d8d Add console command completion
  Applying patches to Everest-Proxy...
Applying: Removidos 10 segundos de delay inicial
Applying: Adicionado InitialHandler#setLoginProfile
Applying: API de definir skin
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M       proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
Falling back to patching base and 3-way merge...
Auto-merging proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
CONFLICT (content): Merge conflict in proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
Patch failed at 0003 API de definir skin
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
  Something did not apply cleanly to Everest-Proxy.
  Please review above details and finish the apply then
  save the changes with rebuildPatches.sh