Updated Rebar files
Fixed merge conflict