Edited Branch.
Fixed merge conflict.