Fixed the merge of the branches. For the class AllocationView.java