Merged uncommited changes